Merge "Add more keyboard layouts."