Merge "Merging list dividers into bg assets and updating other gmail assets" into jb-ub-mail