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