Merge "Refactored switchUSer to handle user switch back to the current user" into udc-qpr-dev