Some 3P launcher transition fixes am: 91d26f0b5e am: 53ceb7df56

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

Change-Id: I24d4d36b6bb5aa5183217c0745a8620093b5c68e