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