Merge "Account for scaling of surfaceInset area in magnification." into...
Merge "Account for scaling of surfaceInset area in magnification." into nyc-mr1-dev am: 60ce77aa am: 4c1a2d5f
am: 9d37d215
Change-Id: I80875640811cf45d1ffa2a39d84d3756636bec21