Merge "Use feature instead of hidden config for multi-display" into oc-dev