Merge "Mark ViewGroupScrollCaptureTest as non-flaky" into sc-dev