am 9ac97492: Merge "Show the delete button if there is room in action bar." into gb-ub-photos-carlsbad

* commit '9ac97492cafafc02357de21074d95b29d55d2e9f':
  Show the delete button if there is room in action bar.