Merge "Always remove IconState in onViewRemoved, even if animations are off" into qt-dev
am: 04d615da92

Change-Id: I1cae438bb250a78413845e8e7d622967a2f7cb56