Merge "Always remove IconState in onViewRemoved, even if animations are off" into qt-dev am: 04d615da am: 51ff5776 Change-Id: Ic41d10e504787af5ef23e024c88b816e73769b6f