Merge "Directly check lockscreen redaction flag for redaction" into main