am 90c31f8b: am 01827ce9: Merge "Be more discriminating when canceling...
am 90c31f8b: am 01827ce9: Merge "Be more discriminating when canceling notifications on changing packages." into jb-dev
* commit '90c31f8b':
Be more discriminating when canceling notifications on changing packages.