bug fixes and wip on variant handling

bug fixes
Merge pull request #13926 from davidflanagan/demokbd3

demo-keyboard app: bug fixes and layout variant handling