Merge "Removing a notification that isn't there isn't a big deal." into jb-dev