Merge "Moving presence tables to the contacts db"