Merge change Iee638412 into eclair

* changes:
  Fix issue #2161726: Car dock app bypasses setup wizard