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: Ic5e415d1eb01767a8caa5b810fe797ce9f431826