Merge "Always run Virtual Display when in a BootsToVR device." into oc-dr1-dev