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