Revert "video_output:control: merge the two wait conditions"