Merge "Account for scaling of surfaceInset area in magnification." into nyc-mr1-dev