Merge "vrwm: Fix controller input/rendering mismatch" into oc-dev