Merge "Fix the race between carrier config and DDS change"