Merge "Restructure vr_ui" am: 20d40ce53a am: 674851dc86 am: 799cd0bb5d
am: cb12f9040f

Change-Id: I75d2427b51373c7775b77bc29a4ebf88498d9247