Merge "Fixed race condition that carrier config change event not notified" into main