Merge "Revert^2 "Set ro.fstype.data when /data is mounted"" into main