am 6939d143: Merge "Make the transition animation identical." into gb-ub-photos-carlsbad

* commit '6939d143cb52a012b1b9cd9a141156357367b212':
  Make the transition animation identical.