Merge "Allow activities to be launched on VR 2D display"