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