am 2581af9b: Merge "add up button support for filmstrip" into gb-ub-photos-carlsbad

* commit '2581af9b08ac913465303795745c3ce24eb0f20c':
  add up button support for filmstrip