Merge "Fix crash when separating multiple empty raw contacts"