Merge "Prevent NPE when no inboxUri"