Merge "Support for correctly scaling text selection handles"