Merge "Allow L2CAP sockets" into klp-dev