CellLayout: Use default and target cell counts

Change-Id: I586a9ca0c5272a85f03bfe7d58f1b4371aba9034
Merge "CellLayout: Use default and target cell counts" into cm-10.1
Merge remote branch 'cm/cm-10.1' into cm-10.1