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

Change-Id: Ide367715e637723725ffe4c83a6f131a1dcc1c89