Merge "Update the offset for wide conversations for archive animations." into jb-ub-mail