Merge "Reduce unnecessary visibility update after resumed" into main