Merge "remount: Check device mapper to see if verity is already disabled"