Factor in CellLayout padding in cell size calculation. am: 8632d9dd1e

Change-Id: I5cf4a8b9ad63ce87efa88708cb4a99439497326c