Merge "Fix Settings creating too many threads unexpectedly" into qt-qpr1-dev