Call cleanup in media connection close
Close and disconnect edge case cleanup
Merge