Merge "Update ADB connect proxy box buttons"