Merge "Add a workaround for simulate secondary display" into oc-dev