Merge "Handle CarrierConfig change when user state is unlock" into main