Merge "TextSelectionToolbar and Style Properties added" into devel/master