Merge pull request #8285 from davidflanagan/bug833300

Bug 833300 - make input field clear buttons work in email app r=asuth
Bug 837909 - start zooming in on preview image, then transition to fullsize r=daleharvey