Merge "Fix rendering issue with layers intersecting the clip rect."