Merge "Add Thread resource overlay support" into main