Merge "vrwm: Add 2D Mode + control app change"