Merge "Revert "Collect NeededUriGrants without holding locks."" into qt-dev am: 2aa255a746
am: ccbe8239ae

Change-Id: I0538320701a64cdc9c4712d2f8b620c05a09f8c5