Merge "Show a dialog when user switching fails" into main