Bug 848625 - make image editing work after orientation changes
Merge pull request #8657 from JonHylands/jhylands-848625-try3

Bug 848625 - make image editing work after orientation changes r=djf