Merge "Make location history package not disableable."