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