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