Merge "Track enable/disable of transport components" into lmp-dev