Merge "Force update the surface of opening targets to visible" into main