Revert theme settings when canceling out of the settings dialog
Corrected jslint error
Merge branch 'master' into themes-8390
Merge pull request #8405 from MiguelCastillo/themes-8390

[Themes] Revert theme settings when cancelling out of the themes dialog