Merge "fix NPE in dispatchKeyEvents" into honeycomb-mr1