Merge "Migrate IBinder to Token" into main