Merge "SystemUI: fix incorrect redaction of profile notifications." into oc-dev