Merge "Fix issue #3117918: No way to finish a native activity" into gingerbread