WindowManager handles the surfaces now correct.