Merge "Add new G20 product keylayout" into main