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

Change-Id: If8c7b3bfbf3413e22eee28986055f4a8c2ecb4e0