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

Change-Id: I7c02a3c2f9308445a2bf365fb386cc2ee0fba53b