Merge "Remove Japanese button swap"