Merge "Show selection handles at the correct position for view transformation" into nyc-dev