Merge "Provide a quick workaround for WM flaky tests" into sc-dev