Merge "Fix groups in WMShellFlickerServiceTests" into main