port target_speaker over to new entity definition file
merge target_delay into target_relay (in a backward compatible way)