Merge "Removing Launcher dependency from Folders" into sc-dev