Fix and clean up video source clearing for Cradle