am ed670b8b: am 81f4b582: Merge "Fix hardware keyboard switch listener" into honeycomb

* commit 'ed670b8b25a6cca95d4cdbd01940bb65d8026586':
  Fix hardware keyboard switch listener