Merge "Fix multiple logs of THEMED_ICON_APPLIED" into main