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

* commit '62cd0cfc336fd6a5bda46f544b556f493c3abae5':
  Fix crash "Gallery has stopped" popup occurs during print setup