Merge "Fix WMShellFlickerTest on TV"