Merge "Re-parent children when Organized Window is no longer controlled" into rvc-dev