Merge "Fix for client tracking on bind to service." into qt-dev