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

Change-Id: I7881f729644e80d8fd881e780390e7102b732eba