Merge "Update snooze visuals to match latest design" into oc-dev