Merge "Use launcher surface when removing launch target" into sc-dev