Merge "Fix picker sync test flakes" into sc-mainline-prod