Merge "Fix contrast issue with folder background and text colors." into sc-dev