Merge "Use US keyboard layout on the console"