Merge "Enable testOnRenderProcessGone" into oc-dev