Merge "Add displayservice." into oc-dev