Merge "Fix Notification redaction when power cycling a non-dozing device while occluded." into sc-dev