Merge "Collect NeededUriGrants without holding locks." into qt-dev am: aac39e204d
am: 9b7de6514b

Change-Id: Ie2cadf7b93d8c76797afec12693324dc55af37b6