Merge "Fix Settings creating too many threads unexpectedly"