Merge "Enable vr mode and persistent vr mode at device boot" into oc-dr1-dev