Merge "Fix parameter order of Lnb.addCallback()" into tm-dev