Merge "SurfaceControlViewHost: Respond to API feedback" into rvc-dev am: 1660402a am: 9dd2d033 am: 27442089 Change-Id: I8478c2a2d7385de752db60412037504c97214c2d