am 2037f39b: Merge "Fix crash "Gallery has stopped" popup occurs during print setup" into gb-ub-photos-carlsbad

* commit '2037f39bd3b5caeb8161928df59acff5cd92dd38':
  Fix crash "Gallery has stopped" popup occurs during print setup