Merge branch 'bug_263_fix_timeshift_live_transition' into experimental