Merge "User.php: Update 'setEmailWithConfirmation' for notification email"