Merge "Replace null snippet/ subject with """ into jb-ub-mail