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

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

Change-Id: I79b9da4370bede27dc11ca61352734a4322d3868