Merge "vr_ui: drawing changes"