Merge "Remove NotifEntryManager" into tm-qpr-dev