Merge "Fix offsetTopAndBottom/LeftAndRight on ICS" into nyc-support-24.1-dev