Merge "Fix bug 4978035 Precondition failure: Not combined mailbox"