Merge "Cache tile state at adapter level" into main