Merge "Refactor CarrierTextController"