Merge "Fix NPE when null content uri is specified" into jb-ub-mail