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

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