Merge "Use IBinder pointer when hashing in InputTransferToken." into main