Merge "Set underlying block device RO when enabling verity"