Merge "Revert "Enable fs-verity in background thread""