Merge "vrwm: Fix flickering when entering/leaving VR"