Merge changes from topic "am-a941bf94e5d845198ebc6657fdfb02f2" into main

* changes:
  [automerger skipped] Merge "Fix padding in QSContainerImpl after re-inflation" into tm-qpr-dev am: eeb0b9fa -s ours am: c380b40c -s ours am: 9250751f -s ours
  [automerger skipped] Fix padding in QSContainerImpl after re-inflation am: 6677f797 -s ours am: 45bb12a6 -s ours am: 61fa5a9f -s ours