#3778: avoid reference from location updater to maps UI
Merge remote-tracking branch 'origin/release'