Merge "Promote/demote flicker tests"