Merge "fix(window magnification):Use SurfaceControlViewHost to create window magnifier" into main