Merge "Fix "<N> contacts" label in tablet contact list" into ics-mr1