Merge "Adding a feature flag to disable icon overrides" into tm-dev