am ffc050ad: Merge "Track active notifications by key, not by reference." into lmp-mr1-dev

* commit 'ffc050ad369c09d740d33f72e66d03f6e2473c49':
  Track active notifications by key, not by reference.