Merge commit 'b6d5b264649f7940739fd5b15755e75ccd7633fc' * commit 'b6d5b264649f7940739fd5b15755e75ccd7633fc': Feature #2296147 Settings for Car/Desk Dock on certain devices
Merge commit 'b6d5b264649f7940739fd5b15755e75ccd7633fc' * commit 'b6d5b264649f7940739fd5b15755e75ccd7633fc': Feature #2296147 Settings for Car/Desk Dock on certain devices