Merge "Fix typo in SurfaceControlViewHost relayout overload" into rvc-dev am: 22837609 am: a438c3b6 Change-Id: I4455fbfef2fc68733e09b4be52dff4fb164362dd