Merge "Add TestApi interfaces for window organizers" into rvc-dev