Merge "Revert "Change carrier name shown No Service to ECO"" into qt-dev