Merge "Revert "Add Swiss French and German keyboard layouts.""