Merge "User Switcher: Dynamically set max col" into tm-dev