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

* commit 'd5dbfe7b0336ef2349dd2ca321ae4cc51cb8b1ff':
  fix Gallery crash using crop