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

Change-Id: I7a90eb649be34b2f99af885ad4559fa9e1d5f727