Merge back earlier 'acpi-dock' material.