Merge "Wait for carrier config to apply in tests" into main