Merge "Fix handling rotation while camera/gallery/crop is active" into jb-dev