Merge "Update subscription before broadcasting carrier config changed event"