Merge "Remove flicker tests from postsubmit with TEST_MAPPING" into sc-dev