Merge "Use pattern for flicker test names"