am 769979f0: am 4597f95e: Merge "Fix handling rotation while camera/gallery/crop is active" into jb-dev

* commit '769979f037f1aacf6cfb842767b5c8c6fcf6b93a':
  Fix handling rotation while camera/gallery/crop is active