Merge "Fix for cancel to remove both posted and enqueued notifications"