Merge "Fix CarrierSettings preference"