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

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

Change-Id: I5eee8f2fd2f1138b74d3e63a311448ecb6d365c8