Merge "Another redesign of notification guts"