Merge changes from topic 'kb-layout'

* changes:
  Always show enabled keyboards.
  Bandaid over broken keyboard layout selection process.