Merge "Remove line3 in big notification unless there's text to show." into jb-dev