[automerger skipped] Merge "Allow bypassing setup for Auto in startDockOrHome"...
[automerger skipped] Merge "Allow bypassing setup for Auto in startDockOrHome" into qt-qpr1-dev am: 88b79a34
am: c5bb7718 -s ours
am skip reason: change_id I05751f93c44405b28f93789e6f8e6cf0a3f34524 with SHA1 1dfce554 is in history
Change-Id: I3d7affcbd535cf379ed12331d43b58ca7e62acfd