Merge "Revert "Destroy docked divider surface when it's hidden.""