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

Change-Id: Ifb4235c7f8b07c9c831c2a6f7e0327212aeb3270