Merge "[Skia]: fix TOMBSTONE issue when browsing JPEG image and exiting Gallery"