Merge "Keydispatching timeout while finish Activity"