[automerger skipped] Merge "Fix Settings creating too many threads unexpectedly" into qt-qpr1-dev am: e1c11ca2e7
am: 4f3bd65a73 -s ours
am skip reason: change_id I149b5926f20acd0e43c4071cc35520c6bc50efef with SHA1 ab21b8a838 is in history

Change-Id: Ie9a7b3840308d7dcb1f4fbb9f9cfcc1f79af59f0