Merge "Automatically clean up flicker test data"