DO NOT MERGE: Allow launcher icon to be config'd in overlay.
am: 24cd592b24

Change-Id: Id9f70ccb67f48c4b4b290fd493f3e7725f1b7a5b