am 6cf0c336: Merge "Various notification template cleanups." into jb-dev

* commit '6cf0c3365a40854f63f0abff2fa67d24432d0218':
  Various notification template cleanups.