am 5472880b: am 13881515: am 88603ea0: am 803ee20f: am 456bec29: Merge "Set the height of the list item, not the TextView within" into ub-gmail-ur14-dev

* commit '5472880bab69b7093cc237681e178d3284b0e175':
  Set the height of the list item, not the TextView within