Merge "Add API for get original image size" into devel/master