Merge "Fix PointerCaptureTest#testEventDispatch" into oc-mr1-dev