Add null check to KeyEventDispatcher. am: 2a0e48aaf5
am: 2aab159e33

Change-Id: Ib06fc038c6322bbb9d8cb090abb89f71018be10a