TV: allow mixing folders and files in the browser

Fixes #2686 (closed) Depends on !1560 (merged)

changed milestone to %3.6.x

added Android TV UI UX feature labels

requested review from @Skantes

marked this merge request as draft

added 3 commits

• f37860fe...346c032e - 2 commits from branch videolan:master
• 280677d5 - TV: allow mixing folders and files in the browser

Compare with previous version

marked this merge request as ready

approved this merge request

added 7 commits

• 280677d5...d20f343a - 6 commits from branch videolan:master
• ba8b6cc6 - TV: allow mixing folders and files in the browser

Compare with previous version

enabled an automatic merge when the pipeline for ba8b6cc6 succeeds

canceled the automatic merge

changed milestone to %3.5.x

added Needs backport label

merged