Merge "Fix can't get correct root icon issue"