Merge "Ensure we change SurfaceView size from UI thread." into nyc-dev