Merge "New user switcher dialog"