Merge pull request #11110 from dominickuo/bug-896580

Bug 896580 - Enable the done button before nocrop is set. r=daleharvey(cherry picked from commit b1aea25ecaf691c3d55c4b1dca2db4c3f2ee6a7c)