Merge "[Thread] use dedicated flag for Thread settings" into main