Merge "Revert "Add temporary hack for keyboards not following spec."" into honeycomb