Merge "Visual tweaks to notifications." into jb-dev