Fix master/slave deadlocks & backport closed caption fixes from 0.25 to 0.23.