Merge "SurfaceControlViewHost: Respond to API feedback" into rvc-dev am: 1660402a am: 9dd2d033 am: ef75f248 am: 0ca09d46 Change-Id: I4c0513db429277a07f131b0721c27a56ff936a38