Merge "Re-parent invoked on child instead of on parent."