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

Change-Id: I456ab84aef88d9582c97e4f2ef29b46c768ce59a