Merge "Fixed enableLocationUpdates crash"