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

Change-Id: I09cb1dfa5f2e6c9e909d8806b001c339f02be0f4