Merge "Subtext of "Add device" should only show when BT is off" into pi-dev