Merge "Handle pre-MR1 in undo notification" into jb-ub-mail-ur8