Merge "Allow bypassing setup for Auto in startDockOrHome" into qt-qpr1-dev