Merge "vrwm: Also recenter the controller when should_recenter_ is set" into oc-dev