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