Merge "Fix launch of activities into VR Virtual display" into oc-mr1-dev
am: 488665d9e3

Change-Id: Ia6d5cfffb8dddf2603a73ae88212fc7353948d67