Merge "SystemUI: fix notification redaction logic." into oc-dev