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

Change-Id: Id98ea0c13c325d79e5c2ae88184351e75ad7db46