Merge "Enable flicker test group1 with Shell transition"