Merge "Support scaling with SurfaceControl when using WindowlessWindow APIs" into rvc-dev