Merge changes Id046ca42,I2dc80993 into main

* changes:
  [flexiglass] Verify flexi only NSSL methods are not called in legacy
  [flexiglass] Remove ScrollViewFields#headsupHeightConsumer