Merge "Last position improvements for GeofenceManager" into jb-mr1-dev