Merge "Align the freeform to docking animation."