[automerger skipped] Merge "Ensure the icon load request matches the ItemInfo...

[automerger skipped] Merge "Ensure the icon load request matches the ItemInfo for the floating view." into ub-launcher3-qt-qpr1-dev am: 8aee0b2c -s ours
am: 73fef775 -s ours
am skip reason: change_id Ib3767ec5c2b4eb22b35e5148879e11d2c1b28e3c with SHA1 08857d2f is in history

Change-Id: I0c8efc866ff8a03981bc027a12b615516bd834d9