Merge "[User Switcher] Fix IllegalStateException in..." into tm-qpr-dev