Merge "Dismissing popup if the underlying icon no longer supports it" into ub-launcher3-master