Merge "Reset SurfaceControl when reapplying magnification spec" am: 8afb2bf120 am: 7f70fe2963

Change-Id: I9159d11344cd9648b24b2b15436e8ac290102d97