Merge "GenericSource: support track (de)selection" into lmp-dev