Merge "Introduce device sys prop for toggling redaction"