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

Change-Id: I357e19b93ac5b1a8396132a14ea43039e0676c34