Merge "Revert "Revert "Add remote callbacks for persistent vr mode"""