Merge "Removing some unused method params from CellLayout" into ub-launcher3-burnaby