Merge "Revert^2 "Tile perf: offload tile state adapter to bg"" into main