Merge "Fix bug with Taskbar not differentiating between user profiles" into tm-qpr-dev