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