Merge "Clean up launched flag removePrepareSurfaceInPlacement" into main