Merge "[Thread] make Thread state customisable via resource overlay" into main