Merge "Fix content capture session id collision bug" into rvc-dev