[automerger skipped] Merge "Reset SurfaceControl when reapplying magnification spec" am: 8afb2bf120 am: 7f70fe2963 am: a11a36187c -s ours
am skip reason: Change-Id Ia04cb6c49b67dab98cee5bb0cacef12a8bdaffd8 with SHA-1 a8b3a273be is in history

Change-Id: I1f68e9f50401816f990edd5d2233f1c2d1324ff0