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

* commit 'ac36ed6d5a08b508b3c610cc06a19799da2deb55':
  Was seeing some duplicated icons in the migration flow