I'm not completely sure if hidden windows are supposed to have a surface, I suspect not but maybe they do once they had one
Not sure either. Which is why if it were me, I would split the commit a bit. In the worst case it would make bisection/regression tracking easier.