Merge "Update conv item background" into ub-gmail-ur14-dev