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

* commit 'd6644d6047b4257c5d01848a45428651f0ae5401':
  fix Gallery crash using crop