Merge "Fixed that snooze options were animating" into oc-dev