Merge "Add debug logs to ActivityTracker" into main