Merge "[SF] Don't reset display state on reconnection" into rvc-dev