Fix 2 bugs involving split staging task translation am: 978b0021 am: 63581566

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



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