Merge "Reduce IconContainer view-model flow emissions" into main