Merge "Catch IllegalArgumentException when calling LocationManager#requestLocationUpdate" into pi-dev