* Go to Text Entry and remove the keyboard change shortcut and uncheck Show current input source in the menu bar
* Go to Language Support and set the Keyboard Input Method System to none
* Open a terminal and do a sudo dpkg-reconfigure keyboard-configuration
* Choose the switch shortcut you like from the list
The indicator is now useless as it does not show the correct layout, but layouts do switch and the shortcuts work in both languages
This is an ugly fix:
* Go to Text Entry and remove the keyboard change shortcut and uncheck Show current input source in the menu bar configuration
* Go to Language Support and set the Keyboard Input Method System to none
* Open a terminal and do a sudo dpkg-reconfigure keyboard-
* Choose the switch shortcut you like from the list
The indicator is now useless as it does not show the correct layout, but layouts do switch and the shortcuts work in both languages