Merge changes from topic "am-9fa54477c8484c1bb888f611140a7495"

* changes:
  [automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into qt-dev am: 13ad919f am: c4ee9df9 -s ours am: 95235208 -s ours am: da52474c -s ours am: d38a74d2 -s ours am: 66a37b06 -s ours
  [automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: b6509bdc am: 14bfa0cb -s ours am: 5336a5af -s ours am: 5ce8479b -s ours am: 14985d3e -s ours am: c6cc906c -s ours