Merge "Fix scroll|enterAlways when we have a top inset" into nyc-support-25.2-dev