Follow up to !65563 (merged), to simplify configs consistently with other TrackStateOnSurfaceDecorator
TrackStateOnSurfaceDecorator