Merge "Skip ScrollCaptureControllerTest on robolectric" into main