Merge "Fix squished user switcher text view." into tm-qpr-dev