Use photo ids in aggregation suggestions

Loading via a photo id seems to update quicker than if done by URI.

Test: manually followed repro steps in comment 4 of bug.
Verified photo always appears

Bug: 32617732
Change-Id: I94088231b30538ec584ff5fc552de1a5c6904c8a