Merge "Fix NPE when the vr manager isn\'t around at first." into nyc-dev am: 1e79be9
am: 8bd6f46

* commit '8bd6f46e584beac42e05abf739e21a1e0938efb4':
  Fix NPE when the vr manager isn't around at first.

Change-Id: Idb33323fb7affe6ebdce236deba857d0add5899d