am cccf2a33: Merge "Keydispatching timeout while finish Activity"

* commit 'cccf2a333793badbcea9b04fe3f29447496a56d9':
  Keydispatching timeout while finish Activity