Merge "Fix flakiness in WMShellUnitTests" into main