Merge "Handle syncing better" into gb-ub-photos-bryce