Merge "Extend the 'qwerty' key layout"