Merge "[DO NOT MERGE] legacy icon treatment / circle detection Bug: 37357483" into ub-launcher3-dorval