Allow icons to be overlayed via resource config.
am: d5b9b0f049

Change-Id: I70398e253578780841d546781837f2a0da0f5fb9