Merge "LocationManager - Handle Shutdown for right User" into nyc-mr1-dev