Better fix for #4240

This fix avoid only the setting of non-existing parameters while keeping
the previous behaviour intact.

Still, there is no action bar at all on maps for devices running 3.x.
Merge branch 'release' into upstream