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