Merge "Do not use hint text for Editor cursor positioning" into nyc-dev