Fixing some bugs in NotificationHandlerActivity