Cherry-pick EmailMoveReceipt changes and resolve conflicts.