Merge "Add assistant-provided snooze options to snooze menu"