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

* commit '4283930e8531894f7749fc7c0fd54897a9a77461':
  fix showing wrong image post save