Mostly revert 788bc510.  It's not needed and created a new bug.

That change was intended to fix a deadlock.  In reality, it only
worked around the deadlock and added a race condition that could cause
delayed handling of reschedule requests.  It was a series of later
changes that actually fixed the deadlocks, so this fix can be fixed by
reverting it.

(cherry picked from commit aafa07e9e314793990e7f58f30bfb6199a430978)
Don't skip over recordings that are still tuning.

Fix a bug where the scheduler sometimes skips over recordings in the
rsTuning state.  This doesn't matter normally as the recording usually
transitiions to the rsRecording state quickly.  When there is a tuning
problem, however, this bug defeats the tuning timeout check in the
scheduler and the recording gets stuck in the tuning state.  This fix
makes sure the tuning check is always done.

(cherry picked from commit f455e491239cc128200db85c90dcab7ea15044c3)