Merge "Fix when vr app launches 2d activity" into oc-dev