Merge "Cancel NotificationTimeout alarms when canceling notification"