Ensure start task waits on messages sent from OnConnected
- This preserves the previous client behavior
- #2653
Merge branch 'release' into dev