Merge "Promote stable flicker tests to presubmit"