Merge "User Switcher: Fix corner case for large names" into tm-dev