Merge "Handle master location settings on/off for NFW location access"