Merge "Fix scrimVisibleHeightTrigger being read as an int" into nyc-support-24.1-dev