Merge changes I61a44a15,I6ac5117f into main

* changes:
  Register callback on main thread.
  Move user switcher to different thread.