Merge "Using parent windowId instead" into rvc-dev