Merge "Adding Prework for Private Space integration in Launcher" into main