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