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

Change-Id: I9e1ff10dcfb2d0adca42566e822968ea5894a9f7