Merge changes Ia67a244b,I7bd162f0 into main

* changes:
  [flexiglass] Update NSSL stack heights, when maxNotifications changes
  [flexiglass] Update ScrollViewFields#intrinsicStackHeight on the LS