SDK: Added fixes for account contact switching