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

* commit '72dfc3814578769bbe1317a8cd62180e63ac8e3d':
  fix showing wrong image post save