Made fallback test more reliable

- Increased timeout in OnConnected.
Merge branch 'release' into dev