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

Change-Id: Ifa16e3b0ce57528fd45264b4f1f04984f5173b2f