Merge "Unhide badge when popup closes without animation" into ub-launcher3-edmonton