Merge "SurfaceControlViewHostTests: Fix race in resize test" into rvc-dev