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

Change-Id: I09b13092823faa0326a588ac654877e0ad3c7613