Merge "Handle EmailProvider unavailable in checkMailboxes()"