Merge branch 'tg/next__cleanup_playlist_tests' into next