am 21eafd79: Use KeyboardTheme id insteand of index

* commit '21eafd7910182a31372fb92895f057cff28a8480':
  Use KeyboardTheme id insteand of index