Merge "Add flicker test for WM Shell"