Merge "Add Call Tracker null check" into main