Merge "Fix up some notification cancelling code" into jb-ub-mail-ur10