Merge "Remove NotifGroupManagerLegacy usage from Bubbles" into tm-qpr-dev