MDL-39021 theme_simple: Last minute changes to allow Simple logo to work with new filepicker for theme settings commited in MDL-35434.