Merge "Fix race conditions in CountQuotaTracker test" into main