Merge "Make sure updateSurfaceSize gets applied after changing config"