Merge "Fixing disabled filter is not applied to the foregound layer when dragging an icon" into ub-launcher3-edmonton