Merge "[User Switcher] Remove callback in onDestroy" into tm-dev