Merge "Null pointer check for Bluetooth traffic" into pi-dev