Merge "Reapply "dragonboards: fstab: Mount /data as F2FS partition"" into main