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

Change-Id: I8177905fb8e7c1227d88534fc9235e57b4bb8663