Merge "Fixed data connection state callback not working" into pi-dev