Merge "Create ActivityDisplay if its registered in DisplayManager" into oc-dev
am: e871c01bd0

Change-Id: I794a53de17d5c6e2d5002c0b363b692723d4dcdd