Merge "Use less icons in hotseat when in 3 button nav for tablet" into tm-dev