Merge "Don't clear snoozed components on restore." into oc-dev