IconSwitch:No Wrapper With Key Change

Build 2674 on fix-layout-issues
Reviewing disabled
Baseline History
This story has no baseline yet. Accept this story to set the baseline.
Commenting is disabled because there's a newer build on this branch