Merge "When updating an icon, keeping the drawable padding same as before" into ub-launcher3-burnaby