Merge "Dump all of AmbientState & NSSL height/padding" into tm-dev