Merge "Tighten up label list on crespo so we can fit more on the smaller screen." into ics-mr1