Merge "Revert^2 "Reduce unnecessary visibility update after resumed"" into main