Merge "Aligning Hotseat and Workspace icons in vertical bar mode" into tm-dev