Merge "Adding Launcher Mode settings to Launcher settings" into main