Merge "Allow bypassing setup for Auto in startDockOrHome" into qt-qpr1-dev
am: 88b79a34b8

Change-Id: I376bcc3f668d563df4e3b8f902311206cbffa3f8