Merge "Merge "Don't commit snooze on horizontal swipes or when its in its expanded state" into oc-dev am: 5ddf88df am: 0efd4ee7"