Merge "Fix vfat retry fsck logic" into main