Merge "Add 2 hours as an option for snoozing, update default to 1 hour" into oc-dev