Merge changes from topic "am-44d997ce-f83c-4bd7-aee0-6ab74e7269f5" into ub-launcher3-master

* changes:
  [automerger] Unhide badge when popup closes without animation am: bb9378aead am: d7eaf26425
  [automerger] Unhide badge when popup closes without animation am: bb9378aead
  Unhide badge when popup closes without animation