Merge "Changing global variable for local variable to prevent memory leaks" into tm-qpr-dev am: 9c83077712

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

Change-Id: Ibba08154760e08134e3d649ad39ef016f1206abb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>