Merge "Promote stable flicker tests (rotation)" into sc-dev