Fixed listening for device setup changes