Merge "Move common logic to UnifiedEmail" into jb-ub-mail