Merge "Adding some source hints when generating theme icons" into main