fix #4289: NPE in switchMyLocationButton
Merge branch 'release' into upstream