Merge "Various notification template cleanups." into jb-dev