Merge "Support to reset the image in ImageView" into devel/master