Merge "Ensure injected gestures respect magnification" into nyc-dev