Merge pull request #13900 from itaiferber/4.1-jsonencoder-defer-container-pops

[4.1] {JSON,Plist}{En,De}coder defer container pops