Merge "Disable failing flicker test"