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