Merge "Fix memory leak in TaskbarLauncherStateController" into sc-v2-dev am: b797ca77b2 am: a4157b6afe

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

Change-Id: Ica815cdb7444d5634f8479a1399373da178a558a