Merge "Delete NotifGroupManagerLegacy" into tm-qpr-dev