Merge "Revert "Add config value for enabling forced themed icon"" into main