Merge "Add icon for user switching" into tm-dev