Merge "Cleanup: remove fs-verity availability check" into main