Merge "Always recreate the SurfaceView when updating the grid preview" into tm-dev