Merge "Generate a new id for each window" into rvc-dev