Merge "Fix bug where icon appears large until transluscent activity finishes." into ub-launcher3-master