Merge "Fix accounting for the position/offset of headers with collapsing views" into sc-dev am: acf27b6d64

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

Change-Id: I40e73e9f0a28f26087b4c1d973180d5362c43837