Merge "Use utilities to trace callbackFlow" into main