Merge "Fix NPE in LocationProviderManager" into sc-dev