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