Merge "Remove shadow on folder icon." into sc-dev