Merge "Disable testOnRenderProcessGone" into oc-dev