Merge "Add null check to KeyEventDispatcher." into nyc-mr1-dev