Merge "Reorder notification actions" into jb-ub-mail-ur8