Merge "[Contextual Edu] Check if target device is connected before incrementing signal count" into main