[automerger skipped] Merge "Ensure the icon load request matches the ItemInfo for the floating view." into ub-launcher3-qt-qpr1-dev
am:8aee0b2cb5-s ours am skip reason: change_id Ib3767ec5c2b4eb22b35e5148879e11d2c1b28e3c with SHA108857d2f13is in history Change-Id: I5fd57a6dfd77bf99dd4d8fe915bbcbe5145be738
This commit is contained in: