Merge "Fix typo in SurfaceControlViewHost relayout overload" into rvc-dev