Merge "fix(window magnification):Create the flag for using SurfaceControlViewHost to create window magnifier" into main