Merge "Always create display content with system identity" into oc-dev