Merge "Make ScrollCaptureControllerTest stricter" into sc-dev