Merge "Remove user switcher callback when exiting user switcher mode" into main