Merge "Leave less space between notificaitons." into jb-dev