Merge "Don't limit carrier text when using large screen" into tm-qpr-dev