Merge "Making sure we don't use Launcher when null" into main