Merge "Don't call surfaceCreated for just changed surfaces" into nyc-dev