Merge "Check null of address in onDeviceCreated" into jb-dev