Merge "Introduce VR recovery ui am: edc6b52f00  -s ours am: 6660c97f07"