Merge "Don't commit snooze on horizontal swipes or when its in its expanded state" into oc-dev