am d35e904a: am 37e1ed36: am c086bddb: am 949debe6: Fix issue where we weren\'t saving span after resize drop (issue 9533407)

* commit 'd35e904ad16a3675009c78d5efcd9a2531e35c4b':