Merge "Folder polish: unbold folder title, ensure icons not cropped in folder." into sc-dev