Merge "Stop leaking Notifications when they change groupKeys." into mnc-dr1.5-dev