Merge "Fix layout to handle long carrier text" into tm-qpr-dev