Merge "Collect NeededUriGrants without holding locks." into qt-dev