Update a few things in the thread layouts

Change-Id: I72336be29396d2b6277a583f86febb1a94da0263
Merge "Update a few things in the thread layouts" into pac-4.4