Merge "Text Editing (enable) property in text controls" into devel/master