am c6c93b92: Merge "Reorder notification actions" into jb-ub-mail-ur8

* commit 'c6c93b92b4c6f156c799b4f9b2c1761caee4a30f':
  Reorder notification actions