Merge "Fixed cursor behavior when no text is set" into devel/master