Merge pull request #14435 from huchengtw-moz/camera/Bug_946803_transform-origin

Bug 946803 - [B2G][Camera] After user opens new photo from thumbnail in ..., r=djf(cherry picked from commit 06386175236ae1618663163849343172668dbdec)
Merge pull request #14620 from davidflanagan/bug946803-v1.2

Merge pull request #14435 from huchengtw-moz/camera/Bug_946803_transform...