Merge "handle carrier config change race conditions"