Merge "Fix poll options for NativeActivity's hasEvents"