Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce