Merge "Restructure vr_ui"
am: 20d40ce53a

Change-Id: I83efb71cf8d36be932660645a36191be0f12ddc7