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

Change-Id: I9b32c79614b3e95a1374cb33ffd424acf1fa226a