Sync with master
Enable new look for Google Maps