Merge "Notification policy access: fix adding / removing package name" into nyc-dev