Merge "Expanding NotificationManager's event logging." into ics-mr1