Merge "Move BT, NFC out of Conntection pref" into pi-dev