Merge "Revert "Add call answered timestamp into call extra"" into main