This issue has been half fixed in 9.5.20.
Top level folders in the Media Bay now display correctly (which is a step in the right direction), however subfolders in the Media Bay and folder display under ‘Favourites’ in the right zone are still out of whack.