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