Merge "Keep standalone devices in VrFlinger mode." into oc-mr1-dev