Merge "Fix repositionChild positioning."