Merge "SurfaceControlViewHost: Respond to API feedback" into rvc-dev am: 1660402a5c

Change-Id: Iaa3a4a9d5e3203fe81bdfcb6389062c9281470ea