Merge "SurfaceControl: Remove transferTouchFocus" into rvc-dev