Merge \\"Stop magnifying surface insets.\\" into nyc-dev am: 4663b4e806
am: e25752e2d2

Change-Id: I20c1106951d77045ea7d4a97694d96ba537b6e73