Merge "Introduce VR recovery ui" am: 5efe2bca22 am: 850e00951a am: 8daabacce5
am: e003fbaa2e

Change-Id: Id250042bae68eb4b2d93cfdeb1c7ec3a36d1e507