Merge "Create a jank test to measure clipped ListView performance (part 2)"