am dfe30aa6: Merge "fix showing wrong image post save" into gb-ub-photos-carlsbad

* commit 'dfe30aa6d008c2aff9fa42a6706867bd2f147425':
  fix showing wrong image post save