am ade16493: Merge "Include horizontal and vertical gap in the count of Key.isOnKey" into honeycomb-mr2

* commit 'ade16493316c906dcef1f5c1a5b65e18a41b4db6':
  Include horizontal and vertical gap in the count of Key.isOnKey