Merge "Remove legacy offscreen layer tracking" into main