Merge "Using a custom view instead of ImageView to avoid relayout when the icon changes" into ub-launcher3-edmonton