Merge "Allow icons to be overlayed via resource config." into nyc-andromeda-dev