Merge branch 'bug_411_timeshift_disable_without_live'