Merge "Fix folder icon text alignment." into sc-dev