Merge "Enable fs-verity in background thread"