8151637: Move CollectionSetChooser rebuild code into CollectionSetChooser Reviewed-by: jmasa, tschatzl