Merge "Implement chip clipping without reparenting" into rvc-dev