Be less aggressive about clearing the bookmark on exit.

Refs #7994.  We shouldn't automatically clear the bookmark at the end
of the recording if the "Clear bookmark on playback" setting is false.
(cherry picked from commit 670cb2d55c36f57ca056babccef1d99ae4c4bad0)

Conflicts:

	mythtv/libs/libmythtv/tv_play.cpp
Update binary version after 525ac31dd2215e5ce46fc3b70f7ba883d99b736a.