Merge "Control magnification only with the setting." into nyc-dev