Merge "Support color block for combined views" into jb-ub-mail