Merge "update ScrollCaptureControllerTest" into sc-dev