Merge "Expand logging for notifications"