Merge "Revert^2 "Set block device as RO/RW before mount"" into main