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

Change-Id: I559a2fe643a03be0345a1586a8b9629436b552d4