Merge "Create new category for lock screen redaction" into oc-dr1-dev