Merge "Change string from "Add device" to "Pair new device"" into pi-dev