am ffe36cdc: Merge "Small cleanup for keyboard drawing code" into jb-mr1-dev

* commit 'ffe36cdc6d41d0ad1031e7d9f8acf6b6f1008970':
  Small cleanup for keyboard drawing code