Merge "Correctly call glviewport when surface changes."