Merge "Add new dm-verity error handling mode"