am 5baf581d: am 743054f5: Merge "disable notification listeners on uninstall" into jb-mr2-dev

* commit '5baf581d58a86a0f9ea9689a1418b925ac49021e':
  disable notification listeners on uninstall