Merge "Fix show image and video when received intent with type image\*"