Merge "vr_ui: drawing changes" am: 9a874a4e5f
am: 3b3f2f5711

Change-Id: I50d1a13b65cf363e55ae62cc1594ffb8932b19ed