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

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

Change-Id: I78d9fdb9cd3301a614bf063e4886692a67083f2a