Add logic to Theme Picker form to sort featured themes to front #3847

#3847