Merge "Fix transition to the wrong location on screen." into nyc-dev