Merge "Add userSwitching state to UserRepository" into tm-qpr-dev