Handle undefined theme the right way

Sorry for the confusion.
This is the right way to do #10236.
Current theme is `undefined` when a theme is uninstalled.  At that point the current logic will use the default theme (light-theme).  So if the theme is installed again, that theme will then continue to be the current theme.