Synchronize surface transaction am: 0a2076e8d3 am: def763740a

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

Change-Id: Ida296e0e004769f4837393f6722683b07c7804b3