Merge "Revert "Use the broadCast Receiver to detect when the user is switched and register the notificationListner when the user is switched.""