Merge "Don't check fs-verity in installer session if not enabled"