Merge "cherrypick: Check for duplicated mailboxes and correct if found" into jb-mr1-dev