Merge "Check for null/invalid attachment Uris in compose intents" into ub-mail-master