Merge "Fix VR component enforcement for "2D in 3D" apps." into oc-dev