Merge "Correctly pre-clip paths when recording display lists"