Merge "Restore dock home support for car docks." into jb-mr2-dev