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