Merge "Fix launch of activities into VR Virtual display" into oc-mr1-dev