Merge "Screen record user switching fixes" into rvc-dev