Merge "Fixing crash when unfolding with an app already open" into tm-dev am: 5e16325ccd

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

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