Merge pull request #2855 from Voyager1/skip-chapters-withoutplaylist