Merge "Revert "[flexiglass] Verify that NSSL#mContentHeight is not accessed"" into main