Move ResetCrossFade() to where cross-fading would actually break, to
make the cross-fading state more reliable.