Merge "Use correct check before using expungeMessageUri" into jb-ub-mail