Merge "Use device set for getDevicesForStream" into tm-dev