Merge "Rename keylayout for SnakeByte iDroid:con to match by name"