Merge "Delete PresenceManager" into tm-dev