Merge "Remove occasional extra bullet at the end of notification text." into jb-dev