Merge "Introduce WindowOrganizer" into rvc-dev