Merge "Was seeing some duplicated icons in the migration flow" into ub-now-queens