Use faster collections in LayoutManager and related classes (#10937)

Change-Id: I27650d6f896a4990bb7a879be995c13252842f60
Merge "Use faster collections in LayoutManager and related classes (#10937)" into 7.0