v4: Couple of additional tweaks that were found while investigating the test failures.
Fwiw the remaining failures are unrelated to this MR and caused by source shutdown being missed if it's called before SET_TOPOLOGY command is executed. The error may be received from the shutdown callback registration, in session_add_media_source, but it doesn't propagate up past session_collect_nodes and is then ignored, leaving the session in an unusable state. I think this would be better fixed with !8415.