Merge "Don't fade in text if icon is in hotseat" into ub-launcher3-dorval-polish
am: 36ace1c74e

Change-Id: I79b0f2c780d7c02fcaffcf84af26f657f103c238