Merge "Fix NPE in interceptKeyBeforeDispatching." into honeycomb