Merge "Check config in multi-display tests" into oc-dev