Merge "Index database before getting Uri Descendants" into pi-dev