Map style panel does not consistently pre-selected current style

[mvl22]

The map style panel has a highlight round one style, but this does not always match the currently-shown style.

E.g. this screenshot shows Mapbox Streets background but the panel has OpenCycleMap highlighted.