Merge "Wait for config callback to reduce flakiness" into main