Handle exceptions when connection_state = 'starting' the same way we do for 'tuning'
Use a catch-all fn head instead
...and inline that again.
Merge bug26313 (again)
stable to default