[t3252 Adding media clips without a protocol shouldn't hang]

Sorry for all of these 12 commits - my cherry-picks all failed and i really don't know, why :/