Hide legacy icon treatment behind a flag.

Change-Id: I662f1317945e6dd175fd03dbabc264e45c18dcee
2 files changed