Merge "Reset SurfaceControl when reapplying magnification spec"