Merge "Show process name next to port number in SettingsPortForwardingActivity" into main