Bug 959430 - [B2G][Gallery][Browser Upload]Images cannot be uploaded to ...

...browser page if user crops image immediately before sending

This PR addresses review comments from this PR: https://github.com/mozilla-b2g/gaia/pull/16056

The integration tests added as part of this PR are checked in as 'skipped' due to timeout issues when running in travis.