Merge "Remove shape detection logic for icon legacy treatment Bug: 117991192" into ub-launcher3-master