Merge "Revert "Added permission check for notifying subscription changed""