CC-5850 : Nested Playlist Fix up