Merge "DO NOT MERGE: Allow launcher icon to be config'd in overlay." into nyc-mr2-dev