Merge "Text controller checks data type of the clipboard" into devel/master