Merge "Introduce VR recovery ui"