am c0c6f058: Merge "fix Gallery crash using crop" into gb-ub-photos-carlsbad

* commit 'c0c6f058d464be3e4d6925239bcabc5b56fbce80':
  fix Gallery crash using crop