Merge "Fix ItemsProviderTest flakiness" into sc-mainline-prod