Merge "Rebalance flicker tests among shards" into main