am 487200db: Merge "Prevent crash after deleting album from Gallery by checking for more null pointers." into gb-ub-photos-carlsbad

* commit '487200db7f4d73e85ae568221d268b46fad19726':
  Prevent crash after deleting album from Gallery by checking for more null pointers.