Merge "Fix checking trackId" into lmp-dev