Merge "Fix a memory leak" into sc-dev am: 29c1e8437e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13961425

Change-Id: Ibe9df851507b75b835ac9cd37d5352e6443ea767