Merge "Always create display content with system identity" into oc-dev
am: 941264de7d

Change-Id: Ic551693590bc817479ea6519a3a87bfc1ad17de8