Merge changes I025902ed,I44f3fc61 into main

* changes:
  Fix user switcher flag test
  Move register callback on view attach and detach