Merge "Register ConnectDeviceFrag with new key" into pi-dev