Merge "Improve user handling when querying for resumable media" into rvc-dev