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

Change-Id: I69d56ae38d9445f662ac3564788ad8da382594b6