Merge "Fix issue 2440226: Car dock volume synchronization."