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

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

Change-Id: I7f5839a02bde5ca4be5fc18b97ace5bef586ef2b