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

Change-Id: Iaf33f16e0dabb0ca56b890a404500a01d26e579d