Merge "Add system config to specify Multi-Display support" into oc-dev