am 3e9032e6: Merge "Increase name-label height so that "g" isn\'t cut off...

am 3e9032e6: 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

Merge commit '3e9032e6' into kraken

* commit '3e9032e6':
  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