Latest upstream changes

@anujmiddha please review:

- Merged in upstream changes 
- Made some properties protected in UserLocationOverlay which are now private in Mapbox