Merge "Remove dock home support." into jb-mr1-dev