Merge "Set initial state of themed icon repository" into main