Merged EnumContentProvider and GridLayoutHelper from master.