Merge pull request #17208 from gregorwagner/tiling

Bug 972779 - [Tarako] Saving picture after editing cause Gallery stop. C...
(cherry picked from commit f3c4a2fc0cfbeccc9c595f06b436707fa2e6ca0a)