Merge "Do not start VrManagerService if VR is not supported" into pi-dev