Merge "Add missing character combinations for international layouts"