Merge "Update the CarLocationService to work when the system user is headless." into pi-dev