Merge "Fix Keyboard shown after force stopped app package"