Merge "Add snooze button to notification guts"