Merge "Make sure updateSurface is called for rotation change" into tm-qpr-dev