Merge "Update surface visibility state when forcing visible" into main