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

Change-Id: Iaf4e9135190c15f053279175ddf9522794a325af