Merge "Fix EMAIL_FILTER ranking for duplicate emails in different accounts"