Merge "Support scaling with SurfaceControl when using WindowlessWindow APIs" into rvc-dev am: 705e25de am: 6c5dedad Change-Id: I470aa5bceef616bbe72965b5172c8238f02f415e