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

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

Change-Id: I818c9a13399b54bfd4b0af0241254b25a45bbe38