am 4dcf1af3: am cccf2a33: Merge "Keydispatching timeout while finish Activity"

* commit '4dcf1af3ed8dfa546e6cbf5ecfa66914a3fda883':
  Keydispatching timeout while finish Activity