Merge "Change folderFillColor to colorBackgroundFloating." into sc-dev