Merge "String change for ConnectionFailureNotifier" into qt-qpr1-dev