Merge "Fixing header jump" into sc-v2-dev am: 48b012b148

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

Change-Id: Ie59fd030a058a75346869e854ee3549fb1977580