Ticket #1554

Not final patch. TODO:
1) Do the same in few other similar places
2) Deal with "--upscaledOutput" case which uses even more fields from
potentially deleted SPS and PPS