Merge changes from topic 'launch-2d-activities-vr' into oc-dev am: f04d039584
am: d020369b77

Change-Id: I42e7ebe0f930457391caced6ed2e14c668aab41a