Merge "Fix image not show issue" into devel/master