Merge "Split flicker tests into groups" into sc-dev