Merge commit 'd7f7213af27fa6c5e476bb8a8d2951feb5e630b5' * commit 'd7f7213af27fa6c5e476bb8a8d2951feb5e630b5': Fix bug where car dock sometimes doesn't connect.
Merge commit 'd7f7213af27fa6c5e476bb8a8d2951feb5e630b5' * commit 'd7f7213af27fa6c5e476bb8a8d2951feb5e630b5': Fix bug where car dock sometimes doesn't connect.