Merge "Add polling and logging when launcher is settings" into main