Merge changes from topic "am-cc8ccf7550664289abceb74e8c8caf64" into main

* changes:
  [automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-dev am: e597df6f -s ours am: 41cce389 -s ours am: 354583d7 -s ours am: 04b584c4 -s ours am: e48e6ed9 -s ours am: 7bcfc61d -s ours am: 51007396 -s ours am: d93648d0 -s ours am: f4db37b0 -s ours am: 7f32ddb2 -s ours am: 84963ee4 -s ours am: 6f8e8808 -s ours
  [automerger skipped] Improve user handling when querying for resumable media am: 684492a0 -s ours am: 3134c90f -s ours am: b0a33db6 -s ours am: e3b5c470 -s ours am: 779c9e90 -s ours am: 25fc1e7d -s ours am: 9699b871 -s ours am: 51b54688 -s ours am: 3427f2a5 -s ours am: a0ba53fd -s ours am: caa4c897 -s ours am: 3a031160 -s ours