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