Merge "Handle null background or foreground when dragging adaptive icons" into ub-launcher3-dorval-polish2