Merge "Avoid consecutive onVisibilityChanged calls" into main