Merge "Fix a regression in magnification center x,y" into nyc-dev