Merge "Adding res id to user switcher item" into tm-qpr-dev