Merge "Increase name-label height so that "g" isn't cut off anymore. Decrease...

Merge "Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts Bug:2542703 Bug:2549485" into froyo