Merge "Be more discriminating when canceling notifications on changing packages." into jb-dev