Merge "restart notification listener on package add" into jb-mr2-dev