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

* commit '76f28bbd64a6841a91d4890d7a248411fd95b149':
  Stop leaking Notifications when they change groupKeys.