am 3568fca9: Merge "Refactor KeyboardTheme as top-level class"

* commit '3568fca95f92d5081755da88a5f6ca4cf518e2b2':
  Refactor KeyboardTheme as top-level class