Merge "Handle DeadObjectExeption when changing users" into tm-qpr-dev