Merge "Fix spurious ANRs in native activities."