Merge "Re-parameterize uirendering tests" into oc-dev