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