Merge "Encapsulate NotifEntry.key and .notification"