Merge commit '5d36efdaa22c2f7c369afbc97b76a07121c98eb7' * commit '5d36efdaa22c2f7c369afbc97b76a07121c98eb7': Fix issue #2161726: Car dock app bypasses setup wizard
Merge commit '5d36efdaa22c2f7c369afbc97b76a07121c98eb7' * commit '5d36efdaa22c2f7c369afbc97b76a07121c98eb7': Fix issue #2161726: Car dock app bypasses setup wizard