Merge "Require DeleteAllKeys to work regardless of rollback resistance tag" into main