playlistscontrols cleanup

Jean Felder requested to merge wip/jfelder/playlistscontrols-cleanup into master Feb 26, 2020