am 6aae9177: Merge "Fix images being off-center in filmstrip." into gb-ub-photos-carlsbad

* commit '6aae9177ac432df82971facab214b365e92b4a04':
  Fix images being off-center in filmstrip.