Merge "Added more argument validation for the user-switch event." into main