Merge "Remove STOPSHIP code from CarrierTextControllerTest" into qt-dev