Merge "Fix adb forward --list when forwarding a lot"