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

Change-Id: Ib46bee991ccf218ee89e96f8d7e3e913be0099a5