Merge "Fix Catalan keyboard layout"