Merge changes I17de7467,I317ebb37 into main

* changes:
  Deduplicate storage of topPadding
  Deduplicate storage of StackTranslation