Merge changes Idb04c4b9,Ic05953a8 into main

* changes:
  [Flexiglass] Don't recalculate expandFraction in the NSSL
  [Flexiglass] Simplify NSSL's stack height calculation