Merge "vr_wm: Disable 2D mode until we can detect it correctly"