Merge "Fix race condition in displayservice." into oc-dev