Fix selected surface not being initialized to null in surface manager