Merge "Shorten LayoutState tag in LinearLayoutManager" into nyc-dev