Merge "SnapdragonGallery: fix blank gray picture after modify"