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

Change-Id: Ie3080c722c45249a32e9531eb1ba4ba080f65fce