Merge "Fix three-line notifications." into jb-dev