Merge "Remove path to provide Launcher with the nav bar surface" into main