am 79e0d0a0: Merge "Update conv item background" into ub-gmail-ur14-dev

* commit '79e0d0a0be9271930332a44876106513efdc9d36':
  Update conv item background