Set Notification Timeout
Merge branch 'notification_timeout'

* notification_timeout:
  Set Notification Timeout