Merge "Fix doesn't show mime icon issue"