Merge "Revert "Fix flake in StatusbarChipsScreenshotTest"" into main