Merge "Removing unused interfaces from Launcher" into main