Merge "Fix stale header height being used in scroll to header calculation" into main