Merge "Updating launcher settings so that they become split-screen" into main