Merge "Prevent double teardown of service connections" into qt-dev