Merge "Cleanup keyboard code." into ub-launcher3-burnaby-polish
am: b88d0bccbe

* commit 'b88d0bccbe997e5c45c930698e37f52865bd9210':
  Cleanup keyboard code.