Merge "Improve surface visibility recovering with transition" into main