Merge "Fix flake in StatusbarChipsScreenshotTest" into main